Add optional support for the company identifier while maintaining backwards compatibility
Merge pull request #7 from juuso/master

Add support for the company identifier and maintain backwards compatibility