A few updates -- big changes will happen soon...
Merge remote-tracking branch 'origin/master'