Fixed a bug, added switch statement support