cleaned up main class and _args stuff
Merge branch 'master' into dev