Merge pull request #242 from claco/sprint

Merged automatically by jenkins after successful gate test