Merge pull request #70 from andymcc/master

Merged automatically by jenkins after successful gate test