Khaos Tian

Results 2 issues of Khaos Tian

* [x] I've started my branch from the `develop` branch (gitflow) * [x] And I've selected `develop` as the "base" branch for this Pull Request I'm about to create *...