Finished work on issue #8