Merge pull request #2 from jadiosa/master

Merge pull request #12 from sebasgalle/master