Added some better version numbers.
Merged in.