Fix #28
Fix #35
Fix #34
Merge pull request #38 from sourceLair/documentation

Fixes #28, #34, #35