solve issues for petra
Merge branch 'master' into xiaodong
Merge pull request #14 from ebf/xiaodong

Xiaodong