Solves issue #10