Merge pull request #95 from freddiekrugerrand/01-22-startupargs