Fixed table display
Integrated master
Merge pull request #1 from ok-devalias/bootstraping

Bootstraping