OS X Compatibility

@DAlOG @AndreyMoskvin please check and confirm if all things are correct. This request resolves #27