Done with issue #88