feature(public): add all previous changes
Merge pull request #147 from Yahkob/feature

feature(public): add all previous changes