Merge branch 'master' of https://github.com/maxwe/maxwe-utils-json

Conflicts:
	README.md
Merge branch 'master' of https://github.com/maxwe/maxwe-utils-json