Initial import
Merge pull request #1 from einhverfr/master

Initial import