added json shorthand
added wait method and timeout support
new version, updated documentation