Version 1.0.0
pulling remote and merging