Merge pull request #1 from lasharn/master

Change min size
Testing pull
Testing conflict
Playback wasmade, still needs to be completed
Merge pull request #2 from pietasty/master

Playback was made, still needs some editing