Merge pull request #1 from AdwinTrave/master

#up1