Consistent comment style.
Use key searching instead of statically setting offset.
Bump version number.