Merge pull request #222 from loftor-git/master

Also: fix typo 310ee3e2dc