New enhancement

New enhancement
Merge pull request #1 from Timbrututti/master

New enhancement