Merge pull request #1 from gjasmin/dev

Dev
Merge pull request #2 from gjasmin/dev

Dev
white background