Update to version 2 with several bug fixes.