Updated version
Reverted to upstream way of guessing version number