Merge pull request #1 from moonfox/develop

merge from origin branch