Fixed Issues #6 #7 #3