Attempting to fix #144.
Merge branch 'patch_for_issue_144' into version3