Fix bug and add conditionals for missing morea types.
Merge remote-tracking branch 'upstream/master'
Moving on toward module 2