Merge pull request #205 from martinthomson/ice-options

Ice options
Fixup ice-options