Add docker mode
Merge master