Merge pull request #192 from askeing/master

Merge v2.0 flash tool into master branch.