Issue #223 fix conventions
Issue #223 fix conventions