Fix
Merge pull request #20 from niode/nathan

Fix