Imporved importing and exporting
Merge branch 'master' of https://github.com/Dominic-Truelen/Truelen