Fixes issues #31 #37 #43 #47
Fixes issues #31 #37 #43 #47
Fixes issues #31 #37 #43 #47
Fixes issues #31 #37 #43 #47
fixes #31, fixes #37, fixes #43, fixes #47