Testing merged with Master Version 1.0