Merge pull request #16 from Mausy5043/documentation-update

Documentation update
Keeping up-to-date with the trunk repository.