Added some debug information and updated some export issues as well
Merge branch 'master'