Fixes #138 Signed-off-by: Dave Thaler <dthaler@ntdev.microsoft.com>
Fixes #124 Signed-off-by: Dave Thaler <dthaler@ntdev.microsoft.com>