reset v1.1.1 & merge AndrewEastwood patch-1 branch