Merge pull request #341 from shenrie/master

Minor fixes and remove unnecessary object creation
Added related resource event and resource policy template