Merge pull request #247 from claco/sprint

Merged automatically by jenkins after successful gate test