updated code to version 1.2.0