Towards 0.2 version

Changes for version 0.2