Made some changes
Merge pull request #1 from RonnyLV/master

Made some changes