Updated from production
Merge pull request #14 from cristiroma/master

Updated from production