--added description
Merge branch 'master' of https://github.com/zaalbarxx/flash