More Changes Throughout
Merge pull request #1 from tstark2/master

More Changes Throughout