Updates and stuff
Merge pull request #2 from jjj5311/patch-1

Updates and stuff