Implements a single version for 1.5 and 2.5
Closes #28