merged beta version 0.2.0