Merge pull request #153 from claco/master

Merged automatically by jenkins after successful build test