kill
Merge branch 'ajax'
added error handling