Merge pull request #1 from BeCareful/master

Merge Company to Master
Merge pull request #3 from BeCareful/company

Merge pull request #1 from BeCareful/master