Merge pull request #535 from sawickiap/master

Version 3.4.0