@Mamute: Fixes #131.