Minor fixes, version 1.2.0