Merge pull request #95 from andymcc/master

Merged automatically by jenkins after successful gate test