Ajax needs testing
Merge pull request #22 from xDreamCoding/ajax

Ajax merge