develop
Merge pull request #48 from kevinyby/develop

modify warehouse