Finished issue #35