Updates for issue #56 and issue #98