Omar edited his implementation [issue #83]