Merge pull request #37 from claco/master

Merged automatically by jenkins after successful build test