Fix bugs
Merge branch 'development' of https://github.com/code-busters/mosby into development