Merge pull request #248 from mancdaz/master

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

Merged automatically by jenkins after successful build test