Version 1.5.1: some bug fixes