Phanupong Rangsanseri

@dmakeroam please verify my new signed commit. Sorry for lot of commits, I'm not quite familiar with this :see_no_evil:

@dmakeroam please review again