Roland's changes
Merge pull request #30 from conclarke/master

Roland's changes