Fixed some whatevers
Merge pull request #15 from niode/nathan

Fixed some whatevers