added changes from milestone 1.0.1