Merge pull request #1 from kennethklee/master

skipping failing tests
fixing small syntax bug
fixing callback on join and tests
using 'self' instead of 'this'