Merge pull request #122 from hooby3dfx/patch-2