#26 contribution added requested functionality