diff --git a/LICENSE b/LICENSE
old mode 100755
new mode 100644
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/bitrise.yml b/bitrise.yml
old mode 100755
new mode 100644
index 95e5253..484c1f7
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -1,13 +1,16 @@
-format_version: 0.9.5
-default_step_lib_source: https://bitbucket.org/bitrise-team/bitrise-new-steps-spec
-
-app:
-  envs:
-  # define these in your .bitrise.secrets.yml
-  - fastlane_action:
-  - work_dir:
+format_version: 1.0.0
+default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
 
 workflows:
   test:
     steps:
+    - git-clone@2.1.0:
+        run_if: true
+        inputs:
+        - repository_url: https://github.com/bitrise-io/fastlane-example.git
+        - branch: master
+        - clone_into_dir: ./_tmp
     - path::./:
+        inputs:
+        - lane: test
+        - work_dir: ./_tmp
diff --git a/step.sh b/step.sh
index 55cadcc..8b1ca3a 100755
--- a/step.sh
+++ b/step.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 # Required parameters
-if [ -z "${fastlane_action}" ] ; then
-  echo "Missing required input: fastlane_action"
+if [ -z "${lane}" ] ; then
+  echo "Missing required input: lane"
   exit 1
 fi
-export lane_name="${fastlane_action}"
+export lane_name="${lane}"
 
 if [ -z "${work_dir}" ] ; then
   echo "Missing required input: work_dir"
@@ -22,4 +22,4 @@ echo "cd \"${work_dir}\""
 cd "${work_dir}"
 
 echo "set -eu -o pipefail && fastlane ${lane_name}"
-fastlane ${lane_name}
\ No newline at end of file
+fastlane ${lane_name}
diff --git a/step.yml b/step.yml
old mode 100755
new mode 100644
index eee407d..17ee176
--- a/step.yml
+++ b/step.yml
@@ -17,17 +17,17 @@ is_skippable: false
 dependencies: []
 run_if: ""
 inputs:
-  - fastlane_action:
+  - lane:
     opts:
-      title: "Fastlane action"
+      title: "Fastlane lane"
       summary: ""
       description: |
         Fastlane action to run
-        $ fastlane [your_action]
+        $ fastlane [lane]
       is_required: true
       is_expand: true
       is_dont_change_value: false
-  - work_dir:
+  - work_dir: $BITRISE_SOURCE_DIR
     opts:
       title: "Work directory"
       summary: ""
diff --git a/step.yml.old b/step.yml.old
deleted file mode 100755
index e94e694..0000000
--- a/step.yml.old
+++ /dev/null
@@ -1,34 +0,0 @@
-name: "Fastlane"
-description: Runs a defined fastlane action
-website: https://github.com/bitrise-io/steps-fastlane
-fork_url: https://github.com/bitrise-io/steps-fastlane
-source:
-  git: https://github.com/bitrise-io/steps-fastlane.git
-host_os_tags:
-  - "osx-10.10"
-project_type_tags:
-  - ios
-type_tags:
-  - build
-  - xcode
-  - fastlane
-is_requires_admin_user: false
-inputs:
-  - mapped_to: fastlane_action
-    title: "Lane name"
-    description: |
-        Lane name to run <br />
-        $ fastlane [lane_name]
-    is_required: true
-    is_expand: true
-    value: ""
-    is_dont_change_value: false
-  - mapped_to: work_dir
-    title: "Work directory"
-    description: |
-        Work directory
-    is_required: true
-    is_expand: true
-    value: ""
-    is_dont_change_value: false
-outputs: []