Fixed drag and drop file load bug
Merge https://github.com/eugenemel/MAVEN
Merge https://github.com/eugenemel/MAVEN