Fixes #68 and #69
Prepare 3.4.1 release