started mac branch
Merge branch 'master' into mac
useful updates