Merge pull request #58 from shotty1/patch-1