Merge pull request #248 from claco/sprint

Merged automatically by jenkins after successful gate test