Finally fixed\!
Merge pull request #61 from captdeaf/master

Finally fixed\!