Merge branch 'release/1.0'
Merge branch 'master' of https://github.com/Nalus/op_systems into feature/problem1