Merge in bug fixes #100 and Class.extend fix