Small template tweaks
Merge branch 'master' of github.com:MineID/MineID