Bug #65 - Working on it
Merge branch 'bug65' into release/0.0.6