cleanning
handle 404
Merge branch 'master' into xmlrpc