Merge pull request #202 from claco/master

Merged automatically by jenkins after successful build test