Merge pull request #84 from mancdaz/master

Merged automatically by jenkins after successful build test
Merge pull request #85 from mancdaz/master

Merged automatically by jenkins after successful build test