Issues 4, 7, 8, 10
Merge branch 'master' of https://github.com/martoriro/revalora-1-2014