Merge pull request #1 from tanahbarrueta/master

Syncing with upstream.
Fix for issue-1

Not really fixing an issue, just playing with github.
Fixing branch name.

And just that.
Merge pull request #2 from elbaloo/issue-1

Fix for issue-1