Merge pull request #3 from x10d/x10d/2376/AJAX

X10d/2376/ajax
Merge branch 'master' into x10d/2376/AJAX