Fixed type error
Added "nice" method names to rules JSON
Merge branch 'master' of https://github.com/michboon/comp2014