Fixes #190.
Merge branch 'master' of https://github.com/symbiose/symbiose