update to 0.1.7 and 0.2.1