Some addition from work
Merge branch 'master' of github.com:NeuralSandwich/home