split up in methods to reduce complexity
Merge remote-tracking branch 'origin/master'