@Mamute: Fixes #11 and fixes #71.