Add maintainer and maintainers commands
Merge new commands
More defensive coding.