Completing the functionality mentioned in the issue #8