Merge pull request #181 from jbussdieker/fix_resource_change_every_checkin