Updating alexs branch from master

Updating alexs branch from master
To fix what raf did :-P