fixed #40 Improvement of scope management