#1 issue is done(commit on brunch)
Changes
#2