Finished issue #51