first try, darwin/linux are separated
Merge remote-tracking branch 'sergeych/master'