removed _parseArgs
Merge branch 'dev'