Version 2.0 - see commit messages for changes
Updated version to 4.3-SNAPSHOT