Bug Fixes

Mac OS X 10.9 support