first updates
Merge pull request #1 from JacobEdelman/master

first updates