Added changes from last repo
Merge branch 'master' of https://github.com/mockingbird2/very-bad