Make the body optional.

fix #605
Merge branch '1.1.x'