Commit for Richard
Merge pull request #219 from WannabeSid/master

Commit for Richard