Fixed javascript error
Updated version info to 1.2.1
Merge pull request #13 from spinningplanet/In-Progress

Update to v1.2.1