Made user selection work
Merge branch 'marvin-dev' of https://github.com/lalezaris/wpi-suite into marvin-dev