Pull request of  framework included in v0.2.3