changes from Scala Study Group on 25 AUG 2013