AJAX for #45, fixed #46