Fixed merge conflicts, version 0.2