@Mamute: Fixes #18, fixes #43 and fixes #45.