Merge branch 'patch-1' of github.com:hilmishariff/phpjs into hilmishariff-patch-1
Add test accomodating #142
Merge branch 'master' of github.com:kvz/phpjs