Fix #33
update to 1.2.1-beta21
Fix #8 for command line mode
Merge pull request #34 from MengZhang/develop

Develop pull request from Meng