3.7.1 bug fixes
Merge https://github.com/gdyer/MBS-Now

This fixes some problems with version 3.6.1. I will submit it later today.