Merge pull request #1 from blowupyourchains/master

update classes