Merge pull request #20 from mancdaz/master

Merged automatically by jenkins after successful build test