Merge pull request #135 from andymcc/sprint

Merged automatically by jenkins after successful gate test