@Mamute: Fix #43 Fix #44 Fix #45.