bugfix
Merge pull request #17 from wislee/master

bugfix