Patch for Issue #120
Merge pull request #121 from aliaspooryorik/develop

Patch for Issue #120