Merge pull request #124 from joellundell/develop

New Feature: Following Flow. Issue #95.