fix rules()
Merge branch 'develop'