Merge pull request #139 from claco/master

Merged automatically by jenkins after successful build test