making it work with OS X
fixing merge problem