Fix #48, #49 + update history