Merge pull request #1 from arnilduyaguit/dev

Initial Commit