- Refactor and cosmetic details
Merge branch 'master' of https://github.com/nbbrooks/sami-dreaam