Merge pull request #28 from mancdaz/master

Merged automatically by jenkins after successful build test