- Adding support for OSX
- Refactoring