Improves compatibility with HipHop
Merge pull request #35 from nsendetzky/master

Improves compatibility with HipHop