Fixed #267, #308 and Update bootstrap version.
 - cause by #229.