merge errors
Merge branch 'master' of https://github.com/pikero24/SimModNet