Put the flags in
Merge branch 'master' of https://github.com/melaniecebula/voxel-server