Added choice class for future use.
Merge branch 'master' into pathfinder