Working now with MacOS

These changes were made by Gilson Nunes.