Finished work on issue #10.