Fix documentation part1
Fix documentation part2
Fix documentation part3
Optimize stuff
Merge pull request #228 from redaxmedia/develop

Develop