Merging branch 'newwgen'