Fixes #17
Merge pull request #20 from FlowForwarding/issue-17

Fixes #17