Merge pull request #28 from flashii/master

satori and other shit