added waiver
Merge branch 'waiver'