Fixes so documentation builds cleanly and translates
Merge pull request #45 from timlinux/develop

Fixes so documentation builds cleanly and translates