Merged solution into master.