closes issues #44, #52