diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index dfa59ee..5dd70b9 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -17,7 +17,7 @@
 
 platform :android do
 
-  desc "Extract Application Id from gradle file"
+  # Extract Application Id from gradle file
   def get_application_id(flavor = nil, path = '../app/build.gradle', constant_name = 'applicationId')
     application_id = nil
     application_id_suffix = nil
@@ -82,7 +82,7 @@
     return "#{application_id}#{application_id_suffix}"
   end
 
-  desc "Define flavor name for deploy branch"
+  # Define flavor name for deploy branch
   def getFlavorName(options)
     flavor = nil
     if options and options[:fl_branch] and ! options[:fl_branch][/.*_.*/]
@@ -104,11 +104,16 @@
     return flavor
   end
 
-  desc "Define package name for a branch"
+  # Define package name for a branch
   def getPackageName(options = nil)
     return get_application_id(getFlavorName(options))
   end
 
+  # Extract VERSION_NUMBER from environment var named VERSION
+  def getVersionNumber(options = nil)
+    return ENV['VERSION'] ? ENV['VERSION'].split('-')[1] : nil
+  end
+
   before_all do |lane, options|
     # ENV["SLACK_URL"] = "https://hooks.slack.com/services/..."
   end
@@ -119,7 +124,7 @@
   	UI.message("App ID = #{getPackageName(options)}")
   end
 
-  desc "Runs all the tests"
+  desc "Run all the tests"
   lane :test do |options|
     gradle(
       task: "test",
@@ -230,7 +235,6 @@
       skip_upload_images: false,
       skip_upload_screenshots: false,
       package_name: "#{getPackageName(options)}",
-      version_code: lane_context[SharedValues::VERSION_CODE],
     )
   end
 
@@ -244,7 +248,7 @@
       skip_upload_images: true,
       skip_upload_screenshots: true,
       package_name: "#{getPackageName(options)}",
-      version_code: lane_context[SharedValues::VERSION_CODE],
+      version_code: getVersionNumber(),
     )
   end
 
@@ -258,10 +262,14 @@
       skip_upload_images: true,
       skip_upload_screenshots: true,
       package_name: "#{getPackageName(options)}",
-      version_code: lane_context[SharedValues::VERSION_CODE],
+      version_code: getVersionNumber(),
     )
   end
 
+  lane :contest do |options|
+    UI.message("Version number = #{getVersionNumber()}")
+  end
+
   # You can define as many lanes as you want
 
   after_all do |lane, options|