Fix #78
Adding functionality for issue #79