Commit 26 - 4:15

LAST COMMIT BEFORE RELEASE :D