Fixes #133
Merge pull request #135 from joedicastro/master

Fixes #133