Merge pull request #44 from beardy-unixer/c8852d455e77624baf9e6ac852c1176f45462e70

Template cleanup
Merge remote-tracking branch 'upstream/master'