Merge pull request #111 from mancdaz/master

Merged automatically by jenkins after successful build test