Fixed issue: Did some checking better. Thanks to @nike-17, @marklocker and @birkir
Merge pull request #659 from sergeyklay/feature-bootstrap-3

Minor fixes