+++ Added support for switch of strings
+++ Fixed warnings
Merge remote-tracking branch 'origin/master'