Merge pull request #208 from claco/master

Merged automatically by jenkins after successful build test