Made some changes.
Merge pull request #2 from nkibler7/master

Made some changes.