Fixed compiling errors & Typos
Merge branch 'master' of github.com:LMUGAF/wsir