Merge pull request #18 from 7sharp9/master

Fix for #17