Merge pull request #17 from tph5595/patch-1