Merge pull request #6 from lmx8doveh/hotfix/1.0.1

Hotfix/1.0.1
haha
Merge pull request #7 from lmx8doveh/feature/CEL-231

haha
Merge pull request #9 from lmx8doveh/dev

Dev