Merge pull request #1 from Nbodypp/master

Updating wally800 (hopefully)
Merge pull request #4 from wally800/master

Merge pull request #1 from Nbodypp/master