Version 1.0 merge from development.