Version 0.3-dev

Some code restructuring, fixes and output decoration