#28: manually merged
#28: typo fix
#21: fixed last issue from list
Merge pull request #69 from avogt/development

#28: manually merged, fixes #28, fixes #21