Finished issue #43