Hopefully now predicting correctly
Merge branches 'master' and 'dev'