Added setting mode. resolved #3
Merge branch 'dev'