Added wicked cool idea

Not really that wicked or cool actually.
Merge branch 'feature-idea'