Devel

pull changes up to 4/09 to master