Merge pull request #62 from andymcc/sprint

Merged automatically by jenkins after successful gate test
Merge pull request #63 from andymcc/sprint

Merged automatically by jenkins after successful gate test