Ordinary changes.
Merge pull request #13 from stefanand/master

Ordinary changes.