updated and merged user guide with develop branch.