BUG #112 fixing ongoing
cleanup
BUG #112 fixing ongoing
BUG #112 fixing ongoing
BUG #112 fixing ongoing
BUG #112 fixed (I hope so)