Manually merged model/model.py from bertioga branch