Added cli support, bumped version to 2.5.0-SNAPSHOT