fixed not compiling issue by removing "public"
Merge branch 'Export' (again)
Forgot to commit some chages (here it is)
Merge branch 'master'