New version of the model from All4Tec
Merge remote-tracking branch 'refs/remotes/origin/master'