#20 apply @jksy s review

@jksy / arigatou. 

@andreareginato / Sorry for many PR, Maybe its late one. xD