tripleoption-3.1.0

Refactoring.