Fixes Issue #99
Fixed #100.
Merge branch 'master' into issue-96