Merge pull request #65 from davidmsantos90/master

[CDE-139] fixed preview mode v2
[CDE-139] - Removing unreachable return statement
[CDE-139] - Removing unreachable return statement
[CDE-139] - Bad merge