new all changes 30march2014

Integration of work from other developers