refs #40, #46 — Prepare for the 0.3.1 release
Remove the useless level of nesting