added changes for 0.1.2