Solves issue #36.