- load rules at startup
- added input validation
Merge remote-tracking branch 'origin/master'