Merge pull request #7 from davy/master

To the future and beyond