@Mamute: Fixes #26 and #42.