Hopefully fixed the previous compile errors.
Merge pull request #5 from assassini/master

Hopefully fixed the previous compile errors