v0.2 fix error and tested on moztrap
Merge pull request #2 from Conjuror/master

v0.2 fix error and tested on moztrap