v2.1.3 - Regular update

The latest bug fixes and improvements.

v1.2.3: Merge pull request #258 from gzurowski/fix-overrides

Consistently use @Override annotation across all classes