update
Merge branch 'master' of https://github.com/k-akashi/meteor

Conflicts:
	meteor/meteor.c