Issue 5

Merge latest Issue #5 changes into master branch.