Small fixes
Merge branch 'master' of https://github.com/Xoin/Pixel-Nations-Beta