Merge pull request #17 from finnjohansen/master

Sync with origin