Fixed #5 #2 #14