Merge branch '1.2.0' of https://github.com/Keyes/tfn into 1.2.0