Fixed #42 (merge), #43, #45, #46, #47, #48, #49