Merge pull request #1 from jalcine/develop

Awesome.
Merge remote-tracking branch 'origin/master'

* origin/master: