updated docs 05-10-2014
merged osx to master