Upstream code patches

Olaf Meeuwissenrequested to merge
upstream_code_patches into master

Deals with issue #8 (closed)

Edited by Ralph Little

Merge request reports