Merge pull request #152 from siwatanejo/master