Finished issue #42