Correction to cycles type check and interpretation, fixes #264
Merge remote-tracking branch 'origin/ncb/development' into ncb/development