Fix for real
Merge pull request #20 from scboucher/master

Fix for real