Felipphe Triviño' 02-05-2014
Merge origin/Release-Version-1.0