Version 3

This is for updating "master" branch to "Version 3".