First fix =)
Merge branch 'master' of https://github.com/themrkefir/pommes.git
Fix server problems