First half corrections
no dbv
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop