- added support of special characters in switch argument
- fixed small typo in switched file naming