Integrated the newest Stapler version

In particular, this includes pull request #39 from Matt that handles
'$class'