a slight config change
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop
dbv
Merge branch 'develop' of https://github.com/johnotaalo/southern_cross-1 into develop
DBV