Initial version tested on OS X
Merge remote-tracking branch 'origin/master'