Modified to work with CI tools without help of xcode