Merge pull request #24 from finnjohansen/master

y