some changes
Merge branch 'development' of https://github.com/4orever/prompc_v2_1 into development