#23 - added company location