Merge pull request #6 from flashii/flashwave

dicks are for my friends
almost release commit

merry chrismassm
Merge pull request #7 from flashii/master

Updating my branch