Fixed #13 #16 #17