Fixed a bunch of things.
Merge pull request #3 from EliteTK/master

Fixed a bunch of things.