Merge pull request #51 from andymcc/master

Merged automatically by jenkins after successful gate test