Merge pull request #85 from mancdaz/master

Merged automatically by jenkins after successful build test