Fixed #1267
Fixed #516; Also reworked data structure for other models
Added jokoho48 to AUTHORS.txt
Merge remote-tracking branch 'upstream/master' into SwitchUnits