Fix null values
Merge branch 'master' of github.com:MineForeman/minepeon-base