Francois Aucamp <francois.aucamp@gmail.com>

Thanks to the following people for patches:
davidphiliplee <https://github.com/davidphiliplee>
chakphanu <https://github.com/chakphanu>
