clubby789 Merge pull request #18 from jpgill86/patch-1