Merge pull request #1 from valentinouno/master

Improvements and some additional functionality
Update main.js

possible fix for player load bug
Update main.js

fixes regarding player load bug
Update main.js

possible fix to the player load bug
Merge pull request #1 from OberstK/master

Updating from OberstK