code refactored
Merge branch 'master' of https://github.com/hendrikgit/vs3