Merge pull request #38 from rasmusprentow/master

Everything up to date