Merge pull request #1 from fonnesbeck/master

class 9/17