Temlate LOL is uzome! //André
Merge remote-tracking branch 'origin/master' into buffer_template