Merge branch 'develop'
Merge branch 'master' of git://github.com/saitoha/tff
Update README
Merge github.com:saitoha/tff into develop

Conflicts:
	tff/tff.py
Merge branch 'develop' of github.com:saitoha/tff into develop