Merge pull request #178 from claco/master

Merged automatically by jenkins after successful build test