Merge pull request #242 from ynsta/master