Fixed Issue #6 #7 #1