Merge pull request #23 from finnjohansen/master

update