Hi, opening a MR for @jcorvill's development so we can easily see the changes.
Addresses #165
FYI @tkariyat