Added feature requested in issue #55