Merge pull request #16 from mys721tx/master

Rewrite for bootstrap3