V 0.1.17 Solves issue #53