last changes
Merge pull request #3 from andrewdibiasio6/master

last changes