Update 3.1 guidelines

Fix #3, Fix #4