Add more options.
Fix a bug.
Bump up to v3.1.