Final alpha code from Even
Merge remote-tracking branch 'origin/master'