main function
merging with master
Merge branch 'master' into dev
bug fix
Merge branch 'dev'