Fixed (#60) and further work on (#57)