Merge pull request #16 from flashii/master

what am i even doing
Merge pull request #17 from flashii/stable

Merge pull request #16 from flashii/master