Fixes
Merge pull request #3 from zquintana/master

Fixes