stand alone
Merge pull request #1 from Switch-Company/develop

stand alone