Now working on 1.2.0