@Mamute: Fixes #55 #76 #77.