Update branch V_0.1.2 (from master)

After few changes in master branch, now we should join this with branch V_0.1.2