Fixes
Merge pull request #14 from ahcorde/master

Fixes