Fix bug deal price.
Some refactoring
Merge branch 'master' of github.com:calabara/hello-unicorn