fix all bugs
Merge branch 'master' of https://github.com/zhanliu/orchard7