Bugfix

#53 #54 #55 #56 Done.