Merge pull request #94 from jbatte47/dev

Issues #92 and #93 - fixed
version bump
Merge branch 'release/3.9.4' into dev