@Mamute: Fixes #106.