This update for Git issue #185
Commit for Git Issue #150