Merge pull request #19 from mancdaz/master

Merged automatically by jenkins after successful build test