Merge branch 'master' of https://github.com/SNOTRAProject/snotra.git