Recommit from last
Merge branch 'develop' of github.com:Bipshark/TDA367 into develop