convert issue #129 into a pull request

Based on 

https://github.com/linuxmint/muffin/issues/129