Add support for retained messages
Reorder command line arguments for clarity
Bump version