Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from joshuapena/master

Merge remote-tracking branch 'upstream/master'