Refactor and performance has been improved
Merge branch 'master' of https://github.com/salvadorbfm/prickles-fight
Fix merge