Migration to 3.4
Merge pull request #13 from sharoonthomas/develop

Migration to 3.4