Updated min file with changes from PRs #96 and #97.