Merge pull request #30 from valegrajales/master

Latest changes of loyalty group
Merge with origin of fork
Merge remote-tracking branch 'upstream/master'
Merge with master