Updated wiki and README.md