Features 2.x Compatible Version

@jbickar
Adding pull request for 2.x features version because I do not have push access to this repository.