Merge pull request #22 from WyseNynja/patch-1