Merge pull request #771 from pmienk/master

Correct doc generation, restore make target results into previous structure.