Merge pull request #63 from plainblack/master

Bringing changes to pt
Call setUser as per spec
Merge branch 'master' into pt
Slight modify.
Fixed js errors