Merge pull request #9 from craineum/hot_refactor

Hot refactor
Merge branch 'master' into plays_refactor