Initial commit for issue #77 fix