add changes from v1.1.1 of official

now supports push!