Fix issue 31 & 32 + Optimizations
Merge pull request #35 from me4502/master

Fixed issue 31 and 32 and optimized the code surrounding storage of players.