Merge pull request #1 from snelso15/master

first real one