Merge pull request #40 from claco/master

Merged automatically by jenkins after successful build test