fixed #58, fixed #68
Merge branch '1.1-stable'
Merge branch 'master' of https://github.com/naomichi-y/delta-framework