Yet another feature.
Merge pull request #3 from kennyhack/new_feature

Yet another feature.