Merge pull request #112 from richardc/patch-1