More on this
Merge branch 'freddes-feature' into develop2
bugfix for release 0.2