Fix indentation
Fix documentation
Work around moc failure
Merge branch 'master' of github.com:topiolli/into