Working on the documentation
Merge pull request #172 from burzum/develop

Working on the documentation