Fixes inconsistencies between docs and code
Merge pull request #128 from johanmeiring/master

Fixes code/documentation inconsistencies