Merge pull request #152 from petems/patch-1