Merge pull request #43 from claco/master

Merged automatically by jenkins after successful build test