Building in mac osx
Merge branch 'master' into feat_select_tuple