Bringing in changes from the upstream

@Yogurt1206 i fixed the unicode drag and drop for you. You should make sure you have committed all your changes on your computer and then merge this pull request into your github fork, and then pull to your local computer. 

You will probably have merge conflicts... we can video chat to work on making sure you dont loose any of your changes.