config by properties
Merge origin/master
Merge origin/master
#195
fix #199