Merge pull request #9 from jamiedigweed/master

master merge
Fix for fill space

shouldn't crash server anymore.
Merge pull request #160 from yashaldie/master

Server crashing fix