merging changes from mac and Nitrous
Merge remote-tracking branch 'origin/master'