Merge pull request #253 from mancdaz/master

Merged automatically by jenkins after successful build test