more problems and solutions
Merge remote-tracking branch 'upstream/master'