Merge pull request #46 from rasmusprentow/master

Down to sk