Resolve #12
Merge branch 'ticket-12' of github.com:lucassimon/opps-tse into ticket-12