Merge pull request #6 from qiuhw/master

Bug fixes from the last tmw merge
remove useless script since we have run-all