Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
update readme
Merge branch 'develop'

Conflicts:
	README.md
Merge branch 'develop'
Merge branch 'develop'
go 1.4