Performance improvements
Prep for release
Merge branch 'release/0.1.2' into develop
added odering for poll option