Work on support for Bootstrap 3 and fixes as reported against previous version