Merge pull request #246 from mancdaz/master

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

Merged automatically by jenkins after successful build test