Fix issues #6 #7 #8 #9 #10 #11