Changed ACTION_WAIT_VAL from static variable to member.
Merge branch 'master' into verzak1_branch
Fixed indent