Solves issue #13