trying to avoid conflicts
Merge branch 'master' of https://github.com/nvankaam/ReactiveProgrammingRx