Merge pull request #1 from jyesares/featured-1.1

My first merge