Merge pull request #1 from blowupyourchains/master

update classes
Merge pull request #5 from astrapi69/master

Merge pull request #1 from blowupyourchains/master