Fixed code
Merge pull request #1 from sethkinast/master

Fixed code