fix bugs

Signed-off-by: mfebrianto <michaelfebrianto@gmail.com>
Merge branch 'master' of github.com:mfebrianto/ces