Resolving #239 and #238
Merge pull request #240 from emacsen/master

Resolving #239 and #238