Merge pull request #41 from claco/master

Merged automatically by jenkins after successful build test