Initial working changes
Merge branch 'master' of github.com:superlativecode/Bonfire-Images