Added better linux env. support