Reverting last commit, introduced some issues
Merge branch 'master' of github.com:webdetails/cde