apply SF Patch #350 and add testcase
Merge pull request #209 from talby-/inc_guard

apply SF Patch #350 and add testcase