Merge tag '0.3.1' into develop

Bugfixes
Code refactoring + Nicer output
version change to 0.4
Merge branch 'release/0.4'