issues #241, #327, #19, #230, #336