#4 #5 both fixed
Merge pull request #11 from Larry1123/master

#4 #5 both fixed