Commit 185cd09bc768973a35344967d5f13a8a0505b4b7

Stephen Moloney 2016-09-21T15:28:54

minor changes