fixes #28
Merge pull request #43 from mmmelissa/master

fixes #28