update readme, manifest
Merge pull request #23 from kuvelas/master

update readme, manifest, few bugs