For Wakanda v8
Merge pull request #9 from melindagallo/master

For Wakanda v8