issue 95
Merge pull request #101 from ryn0/master

issue 95