Merge pull request #319 from cloudbuy/master