Sync with master #2

* updated important changes
* improved code design
* !! removed q info command