Finished issue #66