Add exception just in case
merge commit
Merge pull request #41 from faizkhan00/731-pr

731 pr