Contribute method to directly obtain Choice objects.
Merge branch 'development' of github.com:wlanslovenija/nodewatcher into development