Merge branch 'develop'

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
Quick fix!

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
Finish 1.0.1

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>