Rebased fork in order to receive latest changes and fix upstream merge conflicts
Merge pull request #1 from ichim-david/master

Fixes to export.py
merge upstream/master