Merge commit
Working commit on OSx