Release1.1

please review and pull to master