Added new feature

This new feature really rocks! Please add it to your repo.