Edited
Merge branch 'develop' of github.com:rroth42086/bitstarter into develop