Merge pull request #43 from SaveTheRbtz/master

Merge and logging improvements
v0.21.15
codespell: committed->commited
examples: merge: allow missed -o if -d is specified