Fixes #151 - opened #155 for completion