Merge pull request #3 from benfalk/master

new updates
added ajax and flags
Merge pull request #5 from bpotterbaum/master

JAX'ed it up