issue #4,#6 (refractor) by Michael Spitzer, Gottfried Selenko
Merge branch 'master' of github.com:StefanTischler/Hugo