final changes
Merge pull request #16 from andrewdibiasio6/master

final changes