Merge pull request #1 from arcolife/master

update README; add wiki