Merge pull request #96 from andymcc/master

Merged automatically by jenkins after successful gate test