changes to v2
Merge branch 'master' of https://github.com/Jackmoe/flaming-bear