Updating everything

Fixing the out-dated github version.
phpasr
Fixed conflicts