Version 0.2.0, some changes