merge from leanpub