Migrate to 3.4
Migrate to 3.4
Merge pull request #58 from antonzy/master

Working migration to 3.4.1