Bug fixed
Merge branch 'master' to 'orm'