pcwii Merge pull request #42 from david-morris/master

Added "Choose" feature + bugfix I forgot earlier

e10e8ab