Simplified return

Merged Philip Müller requested to merge maitesin:master into master

Created by: maitesin

I just simplified a return, but...

I would like to change the if ... else nested statements from line 108 into a switch case statement. As the key will be a string I should need to use constexpr feature from C++11 like in http://dev.krzaq.cc/switch-on-strings-with-c11/

Merge request reports