Merge pull request #3 from taosbeta/master

Support command line options