Improved documentation and consistency changes
Merge pull request #22 from Oefenweb/improved-documentation-and-consistency-changes

Improved documentation and consistency changes