updated
Merge branch 'master' of https://github.com/yanivpas/choice

Conflicts:
	module/status.h