Merge develop to master

Add docker support and other things.