Code refactoring + Nicer output
version change to 0.4
Merge branch 'release/0.4'
Merge tag '0.4' into develop

0.4

Code refactoring