Made some changes
Merge pull request #4 from em-nyxzamora/master

Made some changes