#132 refactored rule reading and resolving
Merge remote-tracking branch 'origin/master'
#132 refactored rule reading and resolving