Merge pull request #18 from flashii/master

Sorry to everyone who gets spammed with these things I'm doing
Merge pull request #19 from flashii/stable

Merge pull request #18 from flashii/master