Completed issue #99

Completed work on issue #99