Merge branch 'release/0.3.6' into develop
Fix broken command line handling (short options didnt work).
Add debug console
Bump version to 0.3.7
Merge branch 'release/0.3.7'