fixed #624 + other misc stuff like csv export
Merge remote-tracking branch 'origin/development' into development