Added options
Added hagfish
typo
typo
Testbed grid info converted to options
Merge branch 'master' into develop