convert if to switch (more than 3 nested ifs) closes #39
fix localization problem with unit tests closes #69
fixing PR revision issues
Merge pull request #71 from ElemarJR/master

convert if to switch (more than 3 nested ifs) closes #39