Fixes #41,  #43