fixed some conflicts and changed version to 0.4.0