diff --git a/.travis.yml b/.travis.yml
index a662557..3b59db7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,10 @@ matrix:
       rust: stable
       if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
 
+    - env: TARGET=thumbv8m.main-none-eabi
+      rust: stable
+      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
+
     - env: TARGET=x86_64-unknown-linux-gnu
       rust: nightly
       if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e7ecb9..393a026 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- Adds a feature to work around JLink quirks
+- Adds a dbg! macro using heprintln
+
 ## [v0.3.4] - 2019-04-22
 
 ### Fixed
diff --git a/Cargo.toml b/Cargo.toml
index 0ae5dff..c5dc2c2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,6 +11,7 @@ name = "cortex-m-semihosting"
 readme = "README.md"
 repository = "https://github.com/rust-embedded/cortex-m-semihosting"
 version = "0.3.4"
+edition = "2018"
 
 [features]
 inline-asm = []
diff --git a/src/export.rs b/src/export.rs
index 29df128..37947de 100644
--- a/src/export.rs
+++ b/src/export.rs
@@ -4,7 +4,7 @@ use core::fmt::{self, Write};
 
 use cortex_m::interrupt;
 
-use hio::{self, HStderr, HStdout};
+use crate::hio::{self, HStderr, HStdout};
 
 static mut HSTDOUT: Option<HStdout> = None;
 
diff --git a/src/hio.rs b/src/hio.rs
index 6bd1677..031eeee 100644
--- a/src/hio.rs
+++ b/src/hio.rs
@@ -1,7 +1,7 @@
 //! Host I/O
 
 use core::{fmt, slice};
-use nr;
+use crate::nr;
 
 /// Host's standard error
 pub struct HStderr {
diff --git a/src/lib.rs b/src/lib.rs
index c8c7af6..580ed73 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -123,6 +123,36 @@
 //! ```
 //! Output and monitoring proceed as in the above example.
 //!
+//! ## The `dbg!` macro
+//!
+//! Analogous to [`std::dbg`](https://doc.rust-lang.org/std/macro.dbg.html) the macro
+//! `dbg!` returns a given expression and prints it using `heprintln!` including context
+//! for quick and dirty debugging.
+//!
+//! Example:
+//!
+//! ```
+//! const UUID: *mut u32 = 0x0009_FC70 as *mut u32;
+//! dbg!(UUID);
+//! let mut uuid: [u32; 4] = [0; 4];
+//! for i in 0..4 {
+//!     dbg!(i);
+//!     uuid[i] = unsafe { dbg!(UUID.offset(i as isize).read_volatile()) };    }
+//! }
+//! ```
+//! outputs
+//! ```
+//! [examples/semihosting.rs:37] UUID = 0x0009fc70
+//! [examples/semihosting.rs:40] i = 0
+//! [examples/semihosting.rs:41] UUID.offset(i as isize).read_volatile() = 3370045464
+//! [examples/semihosting.rs:40] i = 1
+//! [examples/semihosting.rs:41] UUID.offset(i as isize).read_volatile() = 1426218275
+//! [examples/semihosting.rs:40] i = 2
+//! [examples/semihosting.rs:41] UUID.offset(i as isize).read_volatile() = 2422621116
+//! [examples/semihosting.rs:40] i = 3
+//! [examples/semihosting.rs:41] UUID.offset(i as isize).read_volatile() = 1044138593
+//! ```
+//!
 //! # Optional features
 //!
 //! ## `inline-asm`
diff --git a/src/macros.rs b/src/macros.rs
index 53e6ef4..263d5fe 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -85,3 +85,29 @@ macro_rules! heprintln {
         $crate::export::hstderr_fmt(format_args!(concat!($s, "\n"), $($tt)*))
     };
 }
+
+/// Macro that prints and returns the value of a given expression
+/// for quick and dirty debugging. Works exactly like `dbg!` in
+/// the standard library, replacing `eprintln` with `heprintln`.
+#[macro_export]
+macro_rules! dbg {
+    () => {
+        $crate::hprintln!("[{}:{}]", file!(), line!());
+    };
+    ($val:expr) => {
+        // Use of `match` here is intentional because it affects the lifetimes
+        // of temporaries - https://stackoverflow.com/a/48732525/1063961
+        match $val {
+            tmp => {
+                $crate::hprintln!("[{}:{}] {} = {:#?}",
+                    file!(), line!(), stringify!($val), &tmp);
+                tmp
+            }
+        }
+    };
+    // Trailing comma with single argument is ignored
+    ($val:expr,) => { $crate::dbg!($val) };
+    ($($val:expr),+ $(,)?) => {
+        ($($crate::dbg!($val)),+,)
+    };
+}