Fixed #13 #14 #15 #16