Merge pull request #15 from WyseNynja/patch-1