Merge pull request #1 from Miramac/0.2.0-Rework-1

merge
Merge pull request #2 from Miramac/master

Merge pull request #1 from Miramac/0.2.0-Rework-1