supports mac
Merge branch 'feature/mac'