--amend
some reading
general framework
Merge pull request #3 from pondering/master

General text