Bags fixes & refactoring
Merge branch 'master' of https://github.com/kiler4747/Curses