Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
  typofixes