Merge pull request #3 from marathanman4202/master

make this branch the same as master