Merge branch 'dockerize' into 'master'