Did some small preparations for the next steps
Merge remote-tracking branch 'github/master'