Merge pull request #28 from flashii/master

satori and other shit
Merge pull request #29 from flashii/stable

Merge pull request #28 from flashii/master