Merge pull request #39 from ewilson/ajax

Ajax
Merge branch 'master' into ajax