Issue #202 -Add Minor fixes