Merge pull request #18 from spirnuise/master

We're basically done!