Fix #18.
Update for fix #18.
Add help if find similar error.
Fix merged conflict.
Merge pull request #4 from ismailsunni/ismail_fixes

Ismail fixes