Merge pull request #205 from andymcc/sprint

Merged automatically by jenkins after successful gate test