issue #12 by Michael Spitzer, Andreas Schmidhofer, Stefan Jaindl
Merge branch 'master' of github.com:StefanTischler/Hugo