Merge pull request #1 from xepps/master

Some additions - Courtesy @xepps
Fixed syntax
Added print statement & tidied docblock
Fixed JSON
Fixed current()
Merge pull request #1 from themainframe/master

Pulling to fix some bugs