Finished issue #39