Fixed #48 #46 #45 #43