befoe merge
final merge
add profile, setting
Merge pull request #13 from laurating/master

add profile,setting