update readme, add wiki link
Merge branch 'master' into dev