avdi Merge pull request #38 from Jason-Cooke/patch-1