Added convinince function; made addon syntax more consistent
Fix merge conflict