Merge pull request #2 from sandsmark/wii