Rolands version
ghhg
Merge pull request #35 from conclarke/master

hjg