v1.3.5 - fix #285, fix #312

Improve bootstrap 3 support
Merge pull request #345 from caseyjhol/master

v1.3.5 - fix #285, fix #312