Merge branch 'chtaube-master'

Merge merge request in issue #12
Merge branch 'master' of https://github.com/badeendjuh/dokubootstrap-simplified