@Mamute: Fixes #51 and fixes #52.