0.2.16

This pull req reverts previous commits that contain poor CHANGELOG, and re-commit it again.