Fixed #13, #1
Fixed #13, #1 exploits!!