Merge pull request from ermaker/master