0.3.1

* Slight improvements in code.
* Small changes in CLI behaviour.
* Hopefully better/clearer code.