Team L2C4 Project - Issue #93 Fix

Hello Alex,
We've tried to implement the feature explained in issue #93.  We think this is what you were looking for.
Let us know if we can improve it in any way.

Thanks!