Got AdRulz pull request Up-to-date with master #93

Tests are passing.