merged some changes from square/master