Merge pull request #177 from claco/master

Merged automatically by jenkins after successful build test