Merge branch 'master' of github.com:Facyla/esope
Updated WS + various old functions