Merge branch 'master' of https://github.com/imuble/kokkvoll.git