Some minor changes. v.1.4.1.2