Merge pull request #15 from cristiroma/master

Updated changes from production