Merge pull request #44 from claco/master

Merged automatically by jenkins after successful build test