fixed coding style.
fixed conflicting namespace.
Merge branch 'master' of https://github.com/imel96/mslib