Finished issue #25