Implementation of #60

This PR has addressed #60.