adding version 1.1.0
merging all the shit