Merge pull request #46 from claco/master

Merged automatically by jenkins after successful build test