initial commit
merge
update readme
Merge pull request #1 from hatoishi/master

Working (probably)