Minor bugfixen
Merge branch 'master' of github.com:hugopeixoto/meoro