Initial import
Merge pull request #1 from hintjens/master

Initial import