Merge pull request #34 from claco/master

Merged automatically by jenkins after successful build test