Merge pull request #15 from OdairTrujillo/index-message