deleted data and set params
Merge branch 'master' of https://github.com/josago/ATAA2014