Most up to date version yet
Merge origin/master
source files configured