Update makefile and start with 3.1
Update 3.1