Added OS X Mavericks compatibility