diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0f7642d..51d2661 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,6 +4,11 @@ version: 2.0
 default: &default-steps
   steps:
     - checkout
+    - run:
+        # Note: this makes it hard to reproduce builds but easier to spot incompatibilities with
+        # newer PlantUML releases. Current trade off seems acceptable.
+        name: Download the latest PlantUML release
+        command: sh ./bin/download-plantuml.sh
     - run:
         name: Update APT packages
         command: apt-get update
diff --git a/bin/download-plantuml.sh b/bin/download-plantuml.sh
new file mode 100644
index 0000000..3be3725
--- /dev/null
+++ b/bin/download-plantuml.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Where the script is executed
+CURRENT_PATH="$(dirname "$(readlink -f "$0")")"
+
+# Where to download the file
+OUTPUT_PATH="${CURRENT_PATH}/plantuml.jar"
+
+# Retrieve the list of versions, in XML format, only one result (the latest)
+VERSIONS_URL='https://search.maven.org/solrsearch/select?q=g:net.sourceforge.plantuml+AND+a:plantuml&core=gav&start=0&rows=1&wt=xml'
+
+# Only match the contents of the version (name="v") XML tag
+LATEST_VERSION="$(curl -s "${VERSIONS_URL}" | grep -oP '(?<=<str name="v">).*(?=</str>)')"
+
+# Compose the download link
+DOWNLOAD_URL="https://search.maven.org/remotecontent?filepath=net/sourceforge/plantuml/plantuml/${LATEST_VERSION}/plantuml-${LATEST_VERSION}.jar"
+
+# finally, download the JAR file
+echo "Downloading PlantUML v${LATEST_VERSION} into ${OUTPUT_PATH}"
+curl -so "${OUTPUT_PATH}" "${DOWNLOAD_URL}" 2>/dev/null
diff --git a/bin/plantuml.jar b/bin/plantuml.jar
deleted file mode 100644
index bb909e1..0000000
Binary files a/bin/plantuml.jar and /dev/null differ
diff --git a/plantuml-mode.el b/plantuml-mode.el
index fe2e3c0..4acf133 100644
--- a/plantuml-mode.el
+++ b/plantuml-mode.el
@@ -37,6 +37,7 @@
 
 ;;; Change log:
 ;;
+;; version 1.2.10, 2019-04-03 Avoid messing with window layouts and buffers -- courtesy of https://github.com/wailo
 ;; version 1.2.9, Revamped indentation support, now working with a greater number of keywords
 ;; version 1.2.8, 2019-01-07 Support indentation for activate / deactivate blocks; allow customization of `plantuml-java-args'
 ;; version 1.2.7, 2018-08-15 Added support for indentation; Fixed the comiling error when installing with melpa