Fixes #32 #33
Fixes #32 #33
Fixes #32
Fixes #34