Merge pull request #1 from YoyodinNG/master

#1
a