close #466 on the client side
Merge pull request #13 from fommil/osx_fixes

close #466 on the client side