Update framework (fix 3)
Merge pull request #1 from trungdq88/update_framework

Update framework (fix 3)