Merge pull request #631 from kebby/master