Merge pull request #92 from andymcc/master

Merged automatically by jenkins after successful gate test