(master) WIP trying to address issue #7. Didn't actually work...
Merge remote-tracking branch 'origin/master' into journey-builder