before fetch
Merge remote-tracking branch 'upstream/develop' into develop

merge
add background
Merge remote-tracking branch 'upstream/develop' into develop

merge
fix a bunch
Merge pull request #63 from palaa159/develop

fix a bunch