updated dependency management
Mac OS X related bug fixes. MXi now works on both iOS and Mac OS X