Merge branch 'release/0.0.6'
am = amend
short status