@Mamute: Fixes #20 and fixes#72.