clean code but still broken
fix segfault
fix merge conflict
Merge branch 'master' of https://github.com/Frogging101/OMPclient