Merge branch 'master' of https://github.com/ppot14/chinchilla.git