2014.11.21.2021 : small corrections and testing