Initial import of version 0.3.4
Merge branch 'release/0.3.4'