#85: Docs change.
Merge branch 'development'
#85: Mistake.
Bugfixes.