Bug fixes and improvement in choice action
New feature: Action Choice
Merge remote-tracking branch 'origin/master'