Use proper version ordering #31