included new changes to 0.1.1