Update readme, fix bugs
Merge pull request #84 from freeslugs/gilad/wiki-update

Update readme, fix bugs