added support v7.. fixing things...
merged projects!