made v0.2
merging work