Fixed Issue #86, #87, #88, #89, #90, #91.