fixing everything
Merge pull request #2 from jstruzik/feature/fix-all-of-the-things

fixing everything