Let's make this useful again
Trim ahead of time as well, also
S P A A A A C E E E S
Merge pull request #38 from sshirokov/unfuck-deployed

Let's make this useful again