v1.2.1 - minor improvments