Added h,s to InputChoices
Included a tester for inputChoices. There seem to be some problems with the h,s solver. To make this work, we have to make an ugly cast in the C++ library...
Merge remote-tracking branch 'refs/remotes/origin/master'