Fixed and added things
Merge pull request #12 from stilldabomb/master

Fixed and added things