Before merge commit
Merge branch 'development' of https://github.com/KN-DEV/devPlan into development
Merged and refinied code