Added failing test cases.
Added code to pass the tests.
Updated README and the CLI interface with the new option.
Code cleanup.
Bump to version 0.3.2