Merge pull request #1 from ventoviro/staging

Sync from Main
Pass HHVM test
Merge pull request #137 from asika32764/hhvm-test

Pass HHVM Test