Adding the fun part
Merge pull request #1302 from cortezcristian/master

Adding the fun part