Merge pull request #27 from bcail/master

add HoldingSimple handling to mods:location