FIx everything
Merge pull request #1 from Rohansi/master

Fix everything