Fixed #4
Merge pull request #29 from bstascavage/master

Fixed #4