Edited several Files
Merge branch 'master' of https://github.com/rage1985/WSMAN--easy