adding changes made for 0.1.7 version