added to do cli merge
Merge branch 'dev-master'
Merge branch 'master' of https://github.com/blackcorvidae/python_1051_project