diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..2fd0127
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{json,yml}]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index e24892a..bb287f4 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -2,8 +2,17 @@ image: openjdk:8
 
 pipelines:
   default:
-    - step:
+    - step:                   # define the build pipeline for the tag
         caches:
           - gradle
+        name: Build and Test
         script:
-          - bash ./gradlew build
+          - bash ./gradlew clean build
+  tags:                         # add the 'tags' section
+    release-*:                  # specify the tag
+      - step:                   # define the build pipeline for the tag
+          caches:
+            - gradle
+          name: Build and Release
+          script:
+            - bash ./gradlew clean build bintrayUpload