one or the other, always forget.
Merge pull request #18 from bjornstar/master

version number bump