Merged private fork into public fork, see Readme