Merge pull request #17 from WyseNynja/master