Fixing no-caller bug
Merge pull request #191 from ilyavolodin/no-caller

Fixing no-caller bug (Fixes  #190)