* test on localhost
Merge branch 'master' into dev
* fix bug