Added feature: clear site directory switch

Last changes before pull request got accepted in origin/master