Fixed issue #591: Fixed previous PR
Merge pull request #592 from sergeyklay/feature-bootstrap-3

Fixed issue #591: Fixed previous PR