Fix typos, simplify "unless/otherwise" construct
Merge pull request #104 from dandv/patch-3

Fix typos, simplify "unless/otherwise" construct