Updated to v0.2.2, including bug fixes and jsLint corrections