John Pineda	26/12/13
John Pineda	26/12/13
John Pineda	26/12/13
Merge origin/master