PR for v3.4.4
Merge pull request #5 from leonardinius/master

PR for v3.4.4