@Mamute: Fixes #48, #49.