Merge pull request #1 from DigiDigi-Studio/master

branch to master 1
Merge pull request #2 from DigiDigi-Studio/idan

Merge pull request #1 from DigiDigi-Studio/master