Attempt at fixing the query bug
Hopefully finish the query fix (aka fix a bug I just introduced)
Merge pull request #22 from sandain/master

Merge the query fix into the server.properties branch