Fix Issue #5 #6 #7 #8 #9