Add Controls classes.
Fix ordering if no position available.
Bump version to 0.3.1
Merge branch 'release/0.3.1' into develop