Issue #80, #86, #87, #88, #89 ,#90