updated
Merge branch 'master' of https://github.com/bartb7/utils

Conflicts:
	gen/async.c