Merge pull request #211 from claco/master

Merged automatically by jenkins after successful build test