Include error model on bot model
Merge branch 'master' into include_error_model
Merge branch 'master' into include_error_model
Merge pull request #171 from dionyziz/include_error_model

Include error model