Merge pull request #233 from lmikoto/master