Update to Aviellecgm

Update 11-07-2014 on community maintained fork.