Added missing line to last commit
Added exit message
Merge pull request #96 from semirke/6.1.x

Fix