Feature/fix new company

Fix #4