Merge pull request #1 from BeCareful/master

Merge Company to Master