Merge pull request #106 from mancdaz/master

Merged automatically by jenkins after successful build test