Merge pull request #4 from prio101/working-desk-one

Author template
Merge pull request #5 from prio101/working-desk-one

A little change on boilerplate
Merge pull request #6 from prio101/master

Master