Updates branch sol006 with master