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

merge