Merge pull request #117 from hooby3dfx/patch-1