Use new features present on bootstrap-3 branch