Updates branch master with sol006 branch, introducing new SOL006 model classes