Merge pull request #93 from phuonghuynh/master

R9 improvements
Merge commit '56a43137cb1e897c11c3ce00701374b4444698e7'
Refactor skill circles factory