Fix
Merge pull request #21 from niode/nathan

Fix