https://github.com/charmeproject/charme_plugin/issues/7
https://github.com/charmeproject/charme_plugin/issues/9

Done, plus a minor typo correction.
Merge origin/master