tweak rules, formatting
Merge branch 'develop' of github.com:isao/scanfs into develop