version 0.3.2 changes: nicer output, version argument, some code comments
Merge jawerty/master 0.3.2, resolve conflicts